From b556516ff2340895d9d6c2acf2530e077cf3d245 Mon Sep 17 00:00:00 2001
From: "kaf24@scramble.cl.cam.ac.uk" <kaf24@scramble.cl.cam.ac.uk>
Date: Wed, 29 Dec 2004 11:16:06 +0000
Subject: [PATCH] bitkeeper revision 1.1159.170.67
 (41d291f6BNS1b72mftsOXrpMhpZ9og)

M
---
 .rootkeys                       | 11 ++++++-----
 xen/Makefile                    |  5 +++--
 xen/tools/Makefile              |  6 ++++++
 xen/{ => tools}/figlet/LICENSE  |  0
 xen/{ => tools}/figlet/Makefile |  0
 xen/{ => tools}/figlet/README   |  0
 xen/{ => tools}/figlet/figlet.c |  0
 xen/{ => tools}/figlet/xen.flf  |  0
 8 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 xen/tools/Makefile
 rename xen/{ => tools}/figlet/LICENSE (100%)
 rename xen/{ => tools}/figlet/Makefile (100%)
 rename xen/{ => tools}/figlet/README (100%)
 rename xen/{ => tools}/figlet/figlet.c (100%)
 rename xen/{ => tools}/figlet/xen.flf (100%)

diff --git a/.rootkeys b/.rootkeys
index e80c251ef1..5fb8173d9f 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -741,11 +741,6 @@
 3ddb79bf2AS7YBGwooE_Kbv7XgUqNQ xen/drivers/pci/pci.ids
 3ddb79bf7sTn85WtP_8Nc2YEmmVExQ xen/drivers/pci/quirks.c
 3ddb79bfJaf0bkE1Y67bnll8-kjEPg xen/drivers/pci/setup-res.c
-3eb3c87fc79FXLA6R9TvdBJNTvQDwA xen/figlet/LICENSE
-3eb3c87fPL2T_zBb0bHlbZY-ACEKRw xen/figlet/Makefile
-3eb3c87fmKYTC5GCh_rydFakZp9ayw xen/figlet/README
-3eb3c87fdQKQ5OBGbM-KjZfi9Us4ng xen/figlet/figlet.c
-3eb3c87fS7DNbg0i6yhFs28UIqAK5g xen/figlet/xen.flf
 40715b2cFpte_UNWnBZW0Du7z9AhTQ xen/include/acpi/acconfig.h
 40715b2cEQWX-PaxEH30qI48K1krnQ xen/include/acpi/acdebug.h
 40715b2c_7j-oy3ZNAuqE3IFNPzArg xen/include/acpi/acdisasm.h
@@ -891,3 +886,9 @@
 3ddb79c0BnA20PbgmuMPSGIBljNRQw xen/include/xen/time.h
 403a3edbG9K5uZjuY19_LORbQGmFbA xen/include/xen/trace.h
 3ddb79c1-kVvF8cVa0k3ZHDdBMj01Q xen/include/xen/types.h
+41d291f5u3J3HYViXLs3cNuFGTvzNg xen/tools/Makefile
+3eb3c87fc79FXLA6R9TvdBJNTvQDwA xen/tools/figlet/LICENSE
+3eb3c87fPL2T_zBb0bHlbZY-ACEKRw xen/tools/figlet/Makefile
+3eb3c87fmKYTC5GCh_rydFakZp9ayw xen/tools/figlet/README
+3eb3c87fdQKQ5OBGbM-KjZfi9Us4ng xen/tools/figlet/figlet.c
+3eb3c87fS7DNbg0i6yhFs28UIqAK5g xen/tools/figlet/xen.flf
diff --git a/xen/Makefile b/xen/Makefile
index d08706d669..a5c883d51d 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -29,7 +29,7 @@ dist: $(TARGET)
 	$(MAKE) prefix=`pwd`/../dist/install dist=yes install
 
 clean:
-	$(MAKE) -C figlet clean
+	$(MAKE) -C tools clean
 	$(MAKE) -C common clean
 	$(MAKE) -C drivers clean
 	$(MAKE) -C arch/$(TARGET_ARCH) clean
@@ -38,6 +38,7 @@ clean:
 
 $(TARGET): delete-unfresh-files
 	[ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
+	$(MAKE) -C tools
 	$(MAKE) include/xen/compile.h
 	$(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s
 	$(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h
@@ -67,7 +68,7 @@ include/xen/compile.h:
 	@LANG=C echo \#define XEN_CHANGESET \"`bk changes -nd':D: :T: :REV: :MD5KEY:' -r+ 2>/dev/null || echo "information unavailable"`\" >> $@
 	@LANG=C echo >> $@
 	@LANG=C echo \#define XEN_BANNER \\ >> $@
-	cd ./figlet && make && ./figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) 1>>../$@ && cd ..
+	( cd ./tools/figlet && ./figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) 1>>../../$@ )
 	@LANG=C echo >> $@
 
 include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
diff --git a/xen/tools/Makefile b/xen/tools/Makefile
new file mode 100644
index 0000000000..8252970158
--- /dev/null
+++ b/xen/tools/Makefile
@@ -0,0 +1,6 @@
+
+default:
+	$(MAKE) -C figlet
+
+clean:
+	$(MAKE) -C figlet clean
\ No newline at end of file
diff --git a/xen/figlet/LICENSE b/xen/tools/figlet/LICENSE
similarity index 100%
rename from xen/figlet/LICENSE
rename to xen/tools/figlet/LICENSE
diff --git a/xen/figlet/Makefile b/xen/tools/figlet/Makefile
similarity index 100%
rename from xen/figlet/Makefile
rename to xen/tools/figlet/Makefile
diff --git a/xen/figlet/README b/xen/tools/figlet/README
similarity index 100%
rename from xen/figlet/README
rename to xen/tools/figlet/README
diff --git a/xen/figlet/figlet.c b/xen/tools/figlet/figlet.c
similarity index 100%
rename from xen/figlet/figlet.c
rename to xen/tools/figlet/figlet.c
diff --git a/xen/figlet/xen.flf b/xen/tools/figlet/xen.flf
similarity index 100%
rename from xen/figlet/xen.flf
rename to xen/tools/figlet/xen.flf
-- 
2.30.2